bitkeeper revision 1.1026.2.2 (40e17d5fDAUxwe75FLw7um8OnJVbFQ)

Fixes to the Python scripts importing xenctl.ip. Required to run xend. Any problems -> let me know (gm281)

diff --git a/tools/xen/lib/xend/XendDomain.py b/tools/xen/lib/xend/XendDomain.py
index 446b7f7fae3f8a08fe3ef66ab5bfbf94a170dbd9..1c0fcf9f5a5e96ea09ec65d66d265cc16f9dcf86 100644 (file)
--- a/tools/xen/lib/xend/XendDomain.py
+++ b/tools/xen/lib/xend/XendDomain.py
@@ -9,7 +9,7 @@ import sys
 from twisted.internet import defer
 
 import xen.ext.xc; xc = xen.ext.xc.new()
-import xenctl.ip
+from xen.util import ip
 
 import sxp
 import XendRoot

diff --git a/tools/xen/lib/xend/XendDomainInfo.py b/tools/xen/lib/xend/XendDomainInfo.py
index 964285ec1320570a949d2267b483fa9850c93ad9..a361e5d25e3a8fbc6e5d476272bccb85bf958729 100644 (file)
--- a/tools/xen/lib/xend/XendDomainInfo.py
+++ b/tools/xen/lib/xend/XendDomainInfo.py
@@ -17,7 +17,7 @@ import os
 from twisted.internet import defer
 
 import xen.ext.xc; xc = xen.ext.xc.new()
-import xenctl.ip
+from xen.util import ip
 
 import sxp